From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 2 Feb 2017 14:46:17 +0000 (+0100)
Subject: x86: undo vm_init() movement from 1a6e3220cc
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2864
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=95c19287580c04c8abd0a0e0bc81d9bec32971a5;p=xen.git

x86: undo vm_init() movement from 1a6e3220cc

There must not be any alloc_xen_pagetable() calls between
end_boot_allocator() and the setting of SYS_STATE_boot.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index ccfd6dd885..176ee74b93 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1376,9 +1376,13 @@ void __init noreturn __start_xen(unsigned long mbi_p)
     else
         end_boot_allocator();
 
-    vm_init();
-
     system_state = SYS_STATE_boot;
+    /*
+     * No calls involving ACPI code should go between the setting of
+     * SYS_STATE_boot and vm_init() (or else acpi_os_{,un}map_memory()
+     * will break).
+     */
+    vm_init();
 
     console_init_ring();
     vesa_init();